Fixed many annoying things
Various improvements