minor updates, still not workable yet.. more to be done