Housekeeping and some style corrections