Cleaned up warnings, added Javadoc comments, get research