Saving Work #4. Some bug fixes