minor updates, still very buggy