added new customcode, lot of fixes too