All done/several bugs fixed