many updates and new stuff