Hacky fixes, TODO
Merge branch 'master' of github.com:socket1/tilde
: