updated some on usability and accounting for weights