moved to an AsyncHttpHandler

some other tweaks and changes