Fixed outstanding issues

Fixed #001
Fixed #002
Fixed #003