Fix outstanding issues

Issues 11, 12, 13