More issues and hopefully fixed..