fixes and some weight stuff