major bugs removed