Icons added, fixes included