partial finish
fix issues