Small changes, tweaking and additions