Fixing issues, not finished