Categories are can now be deleted
Several bug fixes and code cleaning around for redundant calls
Fixed merge conflicts + past commit log