working bugs fixed