1.7.10.1.1_2

Re-committing, some minor fixes