Bug fixes! Almost there