load of fixes, go all green