Fixed many many small things