ignore tmp
updated javadoc and removed pointless comments
updated todo