Final commit for 1.6

Never really got that much done this version, huh?