Started fix on some stuff.