custom effects & optimization

Also a bit of organization.