fixes #25 session timeout, general cleanup of api services