Fixed warnings (some javadoc suppresion; fix later)