add forms, make exports explicit
add haddocks