cleanup, fix, add notes