debug and pljava fixes