major updates, unsplit, url stuff