final commit to dev branch before merge - tons of fixes all over the codebase here - model rewrite