cleaned up some stuff, more polish