misc. Changes, still working on design