Small fixes and update documentaion