Initial change from Nekroze to my preferences.