Sword works and cleaned up entity class' more also mixed a concurrent modification bug