Fixed bugs, added new name, etc etc.