fixed messages added new routines etc