Fixed more functional bugs...