Bug fixes, improvement, ping back emails