Added some stuff while pahimar was on break :D