updated for windows use
updated templates