More additions and changes to java, add .NET