general cleanup, quotations updates etc