Fixed minor issues and added glphs