Bug fixes, style updates and &copy; additions