adding lock init macros, updating cond vars
added more initializers for locks
cute directory nonsense
directory now works and is active