commit with fixes