added modules + cleanup

strongarm