Some changes
Some minor fixes
Added lots of stuff