Add user manual and a few fixes