init
fix issues