Fixed bugs and updated for releases