updates and tweaks, stil a couple bugs