Changed a few more things. Fix the add Entries before compiling