all fixes included