Fixed #912
Fixed #913 and #914

I lost my work commit at one point, and shit was breaking, so i started
again.