Small fixes by Shaymes: http://www.factorioforums.com/forum/viewtopic.php?f=12&t=4545