Fixes, additions, improvements according to Starscream's list