cleaning up
merge stuff from lu-zero