Cleaned up some coding and fixed keyboard setup FC