bugfixes and additions
Update