some explanations and tweaks
better db? + forgotten file