Github issues fixed. 4, 5, 7