Updating git with impoved Avatar, Main, Aux etc

Mostly work on code simplification and bugfixing