everything fixed, tested and working