Bugs squashed
merge