Major fixes

2014-12-27