-fixed method scope
-fixed incorrect naming
-added content links