Program works - all founded bugs fixed