basic aliasing started, cleaning up misc. files