4.1 Various Updates

getting my code in line with new stuff