making subplot tighter

and some smaller fixes