Various fixes/additions, GUI and networking still broken