Some easy tweak

TODO
-Lua stuff