Several bug fixes and cleanup#38

U-238 wants to merge 1 commit intoaff4:masteraff4/pyaff4:masterfrom

U-238:masterU-238/pyaff4:masterCopy head branch name to clipboard