Last minute fixes with @thepixeldeveloper