fix some bug
various fix and work on parser