Re-organized and updated some stuff