Edited some files to fix a weird issue.
More fixes