Changes done, tweaked a few other things. just let me know if anything needs to be changed futher!