Fixing bug.
Adding nicer stuff.