Fixed and improved some things.