Updates and Fixes

New features and new fixes!