Various modifications in preparation for 2015?

Signed-off-by: Kalman Olah <kalman@inuits.eu>