Some new things added and fixed