Fine-tunning classes... and fixing initargs