Big Bug fixed; minor bug fixes