a bunch of updates made by Trevor since laset update