Added ROM expansion and fixed some small issues