Added small fixes and the extension