minor bug fixes

Do NOT use this!!!! I'm in the process of overhauling the windowing
system