minor updates, done properly