fixed static sickness and improved architecture.