Tweaks.

UI still needs work though.