further cleanup, adustments and ui changes...