bunch of updates/fixes