Sleep is a wonderful thing. Fixed all the problems. Closes #57 and closes #56