fix code bugs & done