Fixed terminal & bugs