Fixed some issues. Thanks, Alan!