Feature/fix requires

@chaimsolomon Please review and merge.

Fixes requires and an other minor fixes and documentation cleanup.