Fixed up some of makerom's code