Cleaned up code, fixed up opera support code