big commit. lots of bug fixes, active users