Updated windows app and setup