Adding construct snippet, fixes and improve documentation