Minor code cleanup
some changes to prevtext
fix merge
update views and host ip address