tweaks + list of bugs fixed