More fixes

Added #84 (Bit fiddly at times but it's there)
Fixed #154