Fix Mk II behavior, change names, etc

Check change log for most changes.