Touched up some prop stuff
Fixed #28