Fixing issues and bugs part 2