improve things so they work