Improved and fixed generals