Fixes, tweaking and additions