cleaned up express and added errors