addressed reviews and a lot of fixups