chore: bunch of changes March 14, 2014