Several fixes to guitar part