Fixed major bugs, now to squash usability concerns