some fixes and small comments etc