mostly all inclusive pricing

and a small fix to an error I commited by accident