Integration bugs

Couple of bugs found while working on an addon
fixed some docblocks as well