Minor updates, LT better code quality