Fixed extension and added two new features