NPE fix
Added toString methods which better reprersent the entities
Fixed typos, Java8 lambdas and generics