body saving, several bug fixes