cleaned up more, updated dependencies, fixed api doc syntax