build changes for 0.5 and hopefully many builds to come