It works! Fixed minor issues