Fixing some issues and updating the framework