More updates. The options stuff should show up..