Fixed and refactored gen and draw in Tunnel

Fixed and refactored gen and draw in Tunnel and obstacles