major updates..should have most things now