#141 and some admin stuff