Extension installation, general clean up

Cancelled - Find more jobs like this here