some minor cosmetic adjustments, changed packaged names to bagpipes and removed redundant scalas