moved some parts around and fixed broken names