bugs/tweaks/moving stuff around