fix issues, further cleaning is needed