Fixed most of the stuff requested

Close #65