bugs fixed and compiled