Bugfixes

Several style bugfixes for 1.1.1 release
Update changelog