hopefully fixed final errors