Fixing somemore java shit