A few changes and gui updates here and there