1.2.8 Update

Bug fixes, improvements