Some part numbers and general cleanup