Bug fixes, tweaking of values