Added UIImage and some goodies. Cleaned up some code too.