some edits and fix's