Some improvements and update docs