Advancing a bit further
more fixes