Fixed bugs and added shortcuts