Additions, typos, workaround

- Added explicit return parameters
- Added workaround for the curious lock bug
- Added pop() method for syntactic sugar :)