Logical changes, tweaking