Tweaks + potential bug fixes