fix issues and add several println