additions and window moving fix