saving options, track and some bug fixes