orientation matrix
clean up & minor fixes