small fixes to improve experience