Fixes #15 and resolves #13, also removed some not needed lines with an mor intelligent list reloading machanism