Improvement series part 3 extension (additions and fixing)
Still pretty damn good with or without tweaks
