Bug fixes... Deleting, etc.