Update

Fixes and updates on 29.09.13