some cleanup
better defaults