Misc features

Closes #694 #711