cleaned up jade and added comments to everything