Added slugs, bug fixes