few updates. ready for DP to plug his magic in