More javadocing!
Small code changes in database