Fixes, merges, new functionality