fixing up assembly stuff