Fixes plus additional commands I forgot, still a bit of work left