Some changes
Squashed some bugs