Minor bug fixes, current snapshot
Merging conflicts