Fixed new window/model bug, ready for beta