Some bugs fixed but they are stil there