Routine fixes

Issues 6, 7 and 8 fixed