cleanup and ui fix...