minor changes. q8 still complete. needs to improve efficiency.