added a few changes to the main ms, #178