Small Fixes Update (1.2.1)

View CHANGELOG for description on small fixes and add-ons