minor refactoring
fixed done frame and position