Bug fixes & minor styling/feature changes

See CHANGELOG for details