Cleaned up some stuff, changes final name