Fixed the basic errors, looks good to go! QA still needed