Updates & fixes

Please find some updates to Your code.