Fixing problem with windows not showing up. Close #6. Also increased performance