Help and few bugs fixed