Fix various issues and start working on docs