Made some small updates, removed image validation