Added screen object
Fixed some FIXMEs