fixed some small bugs and changed window location