woohoo, made more changes with the help of the almight sean.