access a few things more directly
fix some small warnings/errors that were overlooked while merging
beta 6 updates and misc cleanup