ready for inital release cleaned up warnings.