first pass at optimization
adding some forgotten optimize files