Cleaned up code. Added alot.