Some of the last changes before the first merge...
Signed-off-by: Antes <antes@simplemachines.org>