too long since last commit, lots of changes