Added more answers + misc improvements