some changes...
some changes.... and cleanups