Fixing too much stuff without commit
Big changes. Bug fixes