Fixed #815 and fixed #816, progress on #811