Another round of changes from eightbitbubsy