move form
minor changes + comments