Various changes including bash prompt