nullpointerexception fixed
random stuff added