Style fix's plus add better api feedback 404/501