removed and changed some previously hard-coded stuff