Updates and bugfixed. Interface polish