renamed and added some building constants