more cleanup, esp core
Move doc comments