More basebuilding updates