Update

Fixed some bugs
Delete some abandonment coding