fix interaction with fuel station and clean some things up