various fixes - seems working now