more updates and fixes

while be doing this for a while