Updated gui and trees, misc code cleanup