Fix bugs. Ensure functionality.