switched to marked everywhere
updated package
updated TODO