more fixes, cheers @ninjalulz