updates

just having fun merging stuff