Been too long since last commit, way too many changes to list here. =(