Some improvements

These issues should be addressed: 4, 11, 52,65