Everything working OK!, ver 2.0

Just some little details left...