Work on spring
bug fixes