bug fix
bug fixes, tweaks