First post after re-do, some other minor changes