Fixed #8
Started work on #13
Continue work on #13
Continue work on #13 - no rights
Fixed #13
Fixed #4