Prepared for production

Bug fixes