bugfixes + Main progress