put someimprovements and cleanup