weekend updates

updates from weekend, many fixes needed / in progress