Updates with interactive shell and bug fix's