updates and cleanup, also added content