Fixed a few minor issues, fixed plotting weights