fixes for potential bugs
tweak
sexy fun