fix bugs from home
fix bugs again