Fixed many many problems