GULP: Additions and cleanup