- JavDoc added, re-written
- Error messages
- Minor changes