Porting + added some new issues