Fixed some minor issues. This is a stable backup.