change of ideas: fixed a few left overs