clean and sync with gsword2

clean and sync with gsword2