optimized folders
small fixes