fix error bug; wip
merge
fix login