more magic number issues