updated extension information in code
more code cleanup