little bug fixes and chances added