various fixes, new track