fixed some errors in docblocks, added sami config