[20170207013217] General Improvements and Bug Fixes