refactoring a bit
going back
Got most things working -- there were also problems with ctb
some final edits for publishing and pushing