Still debugging + some small changes in shell7