Fix a few things, start write up