Several Updates and Fixes
update