cleaned up demo, added fields through js