bugs fixed and new style