Cleaned up, fixed some bugs and added U9