xfce updates and code sanity changes + comments