fixed some issues, made it more user friendly