Some doc.. and general small fixes/improvements.