changed note names, fixed everything