Dev

Join stuff + syntax fixes