functions fixed and shortcuts added