window icon added
some bugs removed