removed tween vars
added some polish