solved almost all the bugs..
missing once