Fixed prompt line wrapping issue
Other minor fixes