fixes
edited more modules for better result and performance