fixed position and some mistakes