todo priority levels implemented
some improvements