Buncha changes made. :>