More progress

fixed stuff.