some weird things going on
some small fixes
doing from left to right