Dev testing and some fixes