initial commit, just fix part of bugs