- Fixed bug in picking code (for last time...)
- Fixed network synchronization errors introduced after code refactor