[20161216021447] General Improvements and Fixes