Various bug fixes, updated readme