last minute bug fixed, hopefully ready now :-)