more tweaking, gonna ask other people to look at it now