Cleaned up code, added more chords