more awesome fixes