More documentation & minor bug fixes