Added comments & shortcuts